Merge branch 'superman' of http://git.shengws.com/zhangbj/xt_vue into superman

src/xt_pages/data/druguseTemplate.vue

@@ -146,27 +146,30 @@
 
                 </template>
               </el-table-column>
+
               <el-table-column
                 prop="amount3"
                 align="center"
-
-                label="使用频率">
+                label="给药途径">
                 <template slot-scope="scope" v-if="scope.row.parent_id == 0">
-                  <span>{{scope.row.execution_frequency}}</span>
+                  <span>{{scope.row.delivery_way}}</span>
                 </template>
               </el-table-column>
 
+
               <el-table-column
                 prop="amount3"
                 align="center"
 
-                label="给药途径">
+                label="执行频率">
                 <template slot-scope="scope" v-if="scope.row.parent_id == 0">
-                  <span>{{scope.row.delivery_way}}</span>
+                  <span>{{scope.row.execution_frequency}}</span>
                 </template>
               </el-table-column>
 
 
+
+
               <el-table-column prop="blood_flow_volume" align="center" label="提醒频率">
                 <template slot-scope="scope">
                   <span v-if="scope.row.frequency_type == 1">每次必推</span>

src/xt_pages/dialysis/PatientBox.vue

@@ -18,7 +18,7 @@
         <ul>
           <li><span class="iconfont">&#xe6f5;</span>班次 : {{timeTypeText(schedule)}}</li>
           <li><span class="iconfont">&#xe6de;</span>床位号 : {{schedule.device_number.number}}</li>
-          <li><span class="iconfont">&#xe6f6;</span>透析模式 : {{$store.getters.treatment_mode[schedule.mode_id].name}}</li>
+          <li><span class="iconfont">&#xe6f6;</span>透析模式 : {{schedule.mode_id?$store.getters.treatment_mode[schedule.mode_id].name:''}}</li>
         </ul>
       </div>
     </div>

src/xt_pages/dialysis/batch_print/batch_print_order.vue

@@ -306,8 +306,20 @@
                       <check-box text="HDF" :checked="isCheckBoxChecked(record.prescription, 'mode_id', 2)"></check-box>
                       <check-box text="HF" :checked="isCheckBoxChecked(record.prescription, 'mode_id', 5)"></check-box>
                       <check-box text="HP" :checked="isCheckBoxChecked(record.prescription, 'mode_id', 4)"></check-box>
-                      <check-box text="HD+HP"
-                                 :checked="isCheckBoxChecked(record.prescription, 'mode_id', 3)"></check-box>
+                      <check-box text="HD+HP" :checked="isCheckBoxChecked(record.prescription, 'mode_id', 3)"></check-box>
+                      <check-box text="SCUF" :checked="isCheckBoxChecked(record.prescription, 'mode_id', 6)"></check-box>
+                      <check-box text="IUF" :checked="isCheckBoxChecked(record.prescription, 'mode_id', 7)"></check-box>
+                      <check-box text="HFHD" :checked="isCheckBoxChecked(record.prescription, 'mode_id', 8)"></check-box>
+                      <check-box text="HFHD+HP" :checked="isCheckBoxChecked(record.prescription, 'mode_id', 9)"></check-box>
+                      <check-box text="PHF" :checked="isCheckBoxChecked(record.prescription, 'mode_id', 10)"></check-box>
+                      <check-box text="HFR" :checked="isCheckBoxChecked(record.prescription, 'mode_id', 11)"></check-box>
+                      <check-box text="HDF+HP" :checked="isCheckBoxChecked(record.prescription, 'mode_id', 12)"></check-box>
+                      <check-box text="CRRT" :checked="isCheckBoxChecked(record.prescription, 'mode_id', 13)"></check-box>
+                      <check-box text="腹水回输" :checked="isCheckBoxChecked(record.prescription, 'mode_id', 14)"></check-box>
+                      <check-box text="HD前置换" :checked="isCheckBoxChecked(record.prescription, 'mode_id', 15)"></check-box>
+                      <check-box text="HD后置换" :checked="isCheckBoxChecked(record.prescription, 'mode_id', 16)"></check-box>
+                      <check-box text="HDF前置换" :checked="isCheckBoxChecked(record.prescription, 'mode_id', 17)"></check-box>
+                      <check-box text="HDF后置换" :checked="isCheckBoxChecked(record.prescription, 'mode_id', 18)"></check-box>
                       其他
                       <div class="under_line" style="width: 100px;">
                         {{record.prescription&&record.prescription.mode_id>5?modeName(record.prescription.mode_id):''}}

src/xt_pages/dialysis/batch_print/batch_print_order_five.vue

@@ -916,7 +916,7 @@
                 <div class="row" style="padding: 2px 0;line-height:24px;">
                   <div class="inline_block">
                     透前体重:
-                    <div class="under_line" style="width: 60px;text-align: left" v-if="record.assessment_before_dislysis">
+                    <div class="under_line" style="width: 60px;text-align: left" v-if="record.assessment_before_dislysis&&record.assessment_before_dislysis.weight_before">
                       {{record.assessment_before_dislysis.weight_before}}
                     </div>
                     <div class="under_line" style="width: 60px;" v-else>

src/xt_pages/dialysis/batch_print/batch_print_order_other.vue

@@ -175,7 +175,7 @@
                       <check-box text="重症酸中毒" :checked="isCheckBoxChecked(record.assessment_before_dislysis, 'emergency_treatment', 3)"></check-box>
                       <div class="inline_block">
                         其它：
-                        <div class="under_line" style="width: 150px;text-align: left">
+                        <div class="under_line" style="min-width: 150px;text-align: left">
                           {{ record.assessment_before_dislysis?record.assessment_before_dislysis.emergency_treatment_other:''}}
                         </div>
                       </div>
@@ -670,6 +670,19 @@
                     <check-box text="HF" :checked="isCheckBoxChecked(record.prescription, 'mode_id', 5)"></check-box>
                     <check-box text="HP" :checked="isCheckBoxChecked(record.prescription, 'mode_id', 4)"></check-box>
                     <check-box text="HD+HP" :checked="isCheckBoxChecked(record.prescription, 'mode_id', 3)"></check-box>
+                    <check-box text="SCUF" :checked="isCheckBoxChecked(record.prescription, 'mode_id', 6)"></check-box>
+                      <!-- <check-box text="IUF" :checked="isCheckBoxChecked(record.prescription, 'mode_id', 7)"></check-box>
+                      <check-box text="HFHD" :checked="isCheckBoxChecked(record.prescription, 'mode_id', 8)"></check-box>
+                      <check-box text="HFHD+HP" :checked="isCheckBoxChecked(record.prescription, 'mode_id', 9)"></check-box>
+                      <check-box text="PHF" :checked="isCheckBoxChecked(record.prescription, 'mode_id', 10)"></check-box>
+                      <check-box text="HFR" :checked="isCheckBoxChecked(record.prescription, 'mode_id', 11)"></check-box>
+                      <check-box text="HDF+HP" :checked="isCheckBoxChecked(record.prescription, 'mode_id', 12)"></check-box>
+                      <check-box text="CRRT" :checked="isCheckBoxChecked(record.prescription, 'mode_id', 13)"></check-box>
+                      <check-box text="腹水回输" :checked="isCheckBoxChecked(record.prescription, 'mode_id', 14)"></check-box>
+                      <check-box text="HD前置换" :checked="isCheckBoxChecked(record.prescription, 'mode_id', 15)"></check-box>
+                      <check-box text="HD后置换" :checked="isCheckBoxChecked(record.prescription, 'mode_id', 16)"></check-box>
+                      <check-box text="HDF前置换" :checked="isCheckBoxChecked(record.prescription, 'mode_id', 17)"></check-box>
+                      <check-box text="HDF后置换" :checked="isCheckBoxChecked(record.prescription, 'mode_id', 18)"></check-box> -->
                   </div>
 
                   <!--<div class="inline_block"  v-if="record.patient.diagnose.length > 10" style="margin-left: -10px">-->
@@ -840,7 +853,7 @@
                 <div class="row" style="padding: 2px 0;line-height:24px;">
                   <div class="inline_block">
                     透前体重:
-                    <div class="under_line" style="width: 60px;text-align: left" v-if="record.assessment_before_dislysis">
+                    <div class="under_line" style="width: 60px;text-align: left" v-if="record.assessment_before_dislysis&&record.assessment_before_dislysis.weight_before">
                       {{record.assessment_before_dislysis.weight_before}}
                     </div>
                     <div class="under_line" style="width: 60px;" v-else>

src/xt_pages/dialysis/batch_print/batch_print_order_other_one.vue

@@ -34,7 +34,7 @@
             <div class="inline_block" style="margin-left: 10px;">
               性别：
               <check-box text="男" :checked="record.patient.gender == 1"></check-box>
-              &nbsp
+              &nbsp;
               <check-box text="女" :checked="record.patient.gender == 2"></check-box>
             </div>
             <div class="inline_block" style="margin-left: 10px;">
@@ -171,7 +171,7 @@
                       <check-box text="重症酸中毒" :checked="isCheckBoxChecked(record.assessment_before_dislysis, 'emergency_treatment', 3)"></check-box>
                       <div class="inline_block">
                         其它：
-                        <div class="under_line" style="width: 150px;text-align: left">
+                        <div class="under_line" style="min-width: 150px;text-align: left">
                           {{ record.assessment_before_dislysis?record.assessment_before_dislysis.emergency_treatment_other:''}}
                         </div>
                       </div>
@@ -1081,6 +1081,9 @@
           return false
         } else {
           return record[key] == target_value
+
+
+          
         }
       }, getAge: function(val) {
         if (val.age == 0) {

src/xt_pages/dialysis/batch_print/batch_print_order_other_two.vue

@@ -68,6 +68,19 @@
                       <check-box text="HF" :checked="isCheckBoxChecked(record.prescription, 'mode_id', 5)"></check-box>
                       <check-box text="HP" :checked="isCheckBoxChecked(record.prescription, 'mode_id', 4)"></check-box>
                       <check-box text="HD+HP" :checked="isCheckBoxChecked(record.prescription, 'mode_id', 3)"></check-box>
+                      <!-- <check-box text="SCUF" :checked="isCheckBoxChecked(record.prescription, 'mode_id', 6)"></check-box>
+                      <check-box text="IUF" :checked="isCheckBoxChecked(record.prescription, 'mode_id', 7)"></check-box>
+                      <check-box text="HFHD" :checked="isCheckBoxChecked(record.prescription, 'mode_id', 8)"></check-box>
+                      <check-box text="HFHD+HP" :checked="isCheckBoxChecked(record.prescription, 'mode_id', 9)"></check-box>
+                      <check-box text="PHF" :checked="isCheckBoxChecked(record.prescription, 'mode_id', 10)"></check-box>
+                      <check-box text="HFR" :checked="isCheckBoxChecked(record.prescription, 'mode_id', 11)"></check-box>
+                      <check-box text="HDF+HP" :checked="isCheckBoxChecked(record.prescription, 'mode_id', 12)"></check-box>
+                      <check-box text="CRRT" :checked="isCheckBoxChecked(record.prescription, 'mode_id', 13)"></check-box>
+                      <check-box text="腹水回输" :checked="isCheckBoxChecked(record.prescription, 'mode_id', 14)"></check-box>
+                      <check-box text="HD前置换" :checked="isCheckBoxChecked(record.prescription, 'mode_id', 15)"></check-box>
+                      <check-box text="HD后置换" :checked="isCheckBoxChecked(record.prescription, 'mode_id', 16)"></check-box>
+                      <check-box text="HDF前置换" :checked="isCheckBoxChecked(record.prescription, 'mode_id', 17)"></check-box>
+                      <check-box text="HDF后置换" :checked="isCheckBoxChecked(record.prescription, 'mode_id', 18)"></check-box> -->
                     </div>
 
                     <!--<div class="inline_block"  v-if="record.patient.diagnose.length > 10" style="margin-left: -10px">-->
@@ -228,7 +241,7 @@
                   <div class="row" style="padding: 2px 0;line-height:24px;">
                     <div class="inline_block">
                       透前体重:
-                      <div class="under_line" style="width: 60px;text-align: left" v-if="record.assessment_before_dislysis">
+                      <div class="under_line" style="width: 60px;text-align: left" v-if="record.assessment_before_dislysis&&record.assessment_before_dislysis.weight_before">
                         {{record.assessment_before_dislysis.weight_before}}
                       </div>
                       <div class="under_line" style="width: 60px;" v-else>

src/xt_pages/dialysis/details/BasicInfor.vue

@@ -20,7 +20,7 @@
         </li>
         <li>
           <label>年龄:</label>
-          <span>{{ patient.age }}</span>
+          <span>{{ getAge(patient) }}</span>
         </li>
         <li>
           <label>透析号 : </label>
@@ -101,6 +101,16 @@ export default {
     }
   },
   methods: {
+    getAge: function(val) {
+      if (val.age == 0) {
+        if (val.birthday == 0) {
+          return ''
+        }
+        return jsGetAge(uParseTime(val.birthday, '{y}-{m}-{d}'), '-')
+      } else {
+        return val.age
+      }
+    },
     stepState: function() {
       return parseInt((Math.random() * 1000) + '') % 2 == 1
     }

src/xt_pages/dialysis/template/DialysisPrintOrderOne.vue

@@ -483,6 +483,45 @@
                 <td width="80">
                   <label-box :isChecked="prescription.mode_id==3?true:false" showValue='HD+HP'></label-box>
                 </td>
+                <td width="80">
+                  <label-box :isChecked="prescription.mode_id==6?true:false" showValue='SCUF'></label-box>
+                </td>
+                <td width="80">
+                  <label-box :isChecked="prescription.mode_id==7?true:false" showValue='IUF'></label-box>
+                </td>
+                <td width="80">
+                  <label-box :isChecked="prescription.mode_id==8?true:false" showValue='HFHD'></label-box>
+                </td>
+                <td width="80">
+                  <label-box :isChecked="prescription.mode_id==9?true:false" showValue='HFHD+HP'></label-box>
+                </td>
+                <td width="80">
+                  <label-box :isChecked="prescription.mode_id==10?true:false" showValue='PHF'></label-box>
+                </td>
+                <td width="80">
+                  <label-box :isChecked="prescription.mode_id==11?true:false" showValue='HFR'></label-box>
+                </td>
+                <td width="80">
+                  <label-box :isChecked="prescription.mode_id==12?true:false" showValue='HDF+HP'></label-box>
+                </td>
+                <td width="80">
+                  <label-box :isChecked="prescription.mode_id==13?true:false" showValue='CRRT'></label-box>
+                </td>
+                <td width="80">
+                  <label-box :isChecked="prescription.mode_id==14?true:false" showValue='腹水回输'></label-box>
+                </td>
+                <td width="80">
+                  <label-box :isChecked="prescription.mode_id==15?true:false" showValue='HD前置换'></label-box>
+                </td>
+                <td width="80">
+                  <label-box :isChecked="prescription.mode_id==16?true:false" showValue='HD后置换'></label-box>
+                </td>
+                <td width="80">
+                  <label-box :isChecked="prescription.mode_id==17?true:false" showValue='HDF前置换'></label-box>
+                </td>
+                <td width="80">
+                  <label-box :isChecked="prescription.mode_id==18?true:false" showValue='HDF后置换'></label-box>
+                </td>
 
                 <td width="35">其他</td>
                 <td width="100">

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -371,11 +371,11 @@
                   <div v-if="prescription.anticoagulant != 1"  class="under_line" style="width: 50px;text-align: center;">
                     {{prescription.anticoagulant_weichi?prescription.anticoagulant_weichi:"0"}}
                   </div>
-                  <span v-if="prescription.anticoagulant == 5">ml</span>
-                  <span v-if="prescription.anticoagulant == 4">mg</span>
-                  <span v-if="prescription.anticoagulant == 3">iu</span>
-                  <span v-if="prescription.anticoagulant == 2">iu</span>
-                  <span v-if="prescription.anticoagulant == 1">mg</span>
+                  <span v-if="prescription.anticoagulant == 5">ml/h</span>
+                  <span v-if="prescription.anticoagulant == 4">mg/h</span>
+                  <span v-if="prescription.anticoagulant == 3">iu/h</span>
+                  <span v-if="prescription.anticoagulant == 2">iu/h</span>
+                  <span v-if="prescription.anticoagulant == 1">mg/h</span>
 
                 </div>
                 <div class="inline_block" style="margin-left:20px;" v-if="prescription.anticoagulant == 5">
@@ -783,7 +783,7 @@
               <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: 90%;line-height: 25px;text-align: left;margin-left: 2px; display:inline-block;"> {{summary.dialysis_summary?summary.dialysis_summary:'/'}}</div>
+                  <div class="under_line" style="width: 820px;line-height: 25px;text-align: left;margin-left: 2px; display:inline-block;word-wrap: break-word;word-break: break-all;white-space: normal;"> {{summary.dialysis_summary?summary.dialysis_summary:'/'}}</div>
                 </div>
               </div>
 

src/xt_pages/dialysis/template/dialysisPrintOrderTwo.vue

@@ -165,8 +165,8 @@
                   <check-box text="重症酸中毒" :checked="predialysis.emergency_treatment == 3?true:false"></check-box>
                   <div class="inline_block">
                     其它：
-                    <div class="under_line" style="width: 100px;text-align: left">
-                      <span v-if="predialysis.emergency_treatment == -1">{{predialysis.emergency_treatment_other}}</span>
+                    <div class="under_line" style="min-width: 100px;text-align: left">
+                      <span>{{predialysis.emergency_treatment_other}}</span>
                     </div>
                   </div>
                 </div>
@@ -639,6 +639,19 @@
                 <check-box text="HF" :checked="prescription.mode_id==5?true:false"></check-box>
                 <check-box text="HP" :checked="prescription.mode_id==4?true:false"></check-box>
                 <check-box text="HD+HP" :checked="prescription.mode_id==3?true:false"></check-box>
+                <!-- <check-box text="SCUF" :checked="prescription.mode_id==6?true:false"></check-box>
+                <check-box text="IUF" :checked="prescription.mode_id==7?true:false"></check-box>
+                <check-box text="HFHD" :checked="prescription.mode_id==8?true:false"></check-box>
+                <check-box text="HFHD+HP" :checked="prescription.mode_id==9?true:false"></check-box>
+                <check-box text="PHF" :checked="prescription.mode_id==10?true:false"></check-box>
+                <check-box text="HFR" :checked="prescription.mode_id==11?true:false"></check-box>
+                <check-box text="HDF+HP" :checked="prescription.mode_id==12?true:false"></check-box>
+                <check-box text="CRRT" :checked="prescription.mode_id==13?true:false"></check-box>
+                <check-box text="腹水回输" :checked="prescription.mode_id==14?true:false"></check-box>
+                <check-box text="HD前置换" :checked="prescription.mode_id==15?true:false"></check-box>
+                <check-box text="HD后置换" :checked="prescription.mode_id==16?true:false"></check-box>
+                <check-box text="HDF前置换" :checked="prescription.mode_id==17?true:false"></check-box>
+                <check-box text="HDF后置换" :checked="prescription.mode_id==18?true:false"></check-box> -->
               </div>
 
               <!--<div class="inline_block"  v-if="patientInfo.diagnose.length <= 10">-->
@@ -704,8 +717,8 @@
               </div>
               <div class="inline_block">
                 其它：
-                <div class="under_line" style="width: 100px;text-align: left">
-                  <span v-if="prescription.special_medicine == -1">{{prescription.special_medicine_other}}</span>
+                <div class="under_line" style="width: 150px;text-align: left">
+                  <span >{{prescription.special_medicine_other}}</span>
                 </div>
               </div>
             </div>

src/xt_pages/stock/cancelStockOrder.vue

@@ -158,8 +158,8 @@
         <el-pagination
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
-          :page-sizes="[7, 10, 50, 100]"
-          :page-size="7"
+          :page-sizes="[10, 50, 100]"
+          :page-size="10"
           background
           style="margin-top:20px;float: right"
           layout="total, sizes, prev, pager, next, jumper"
@@ -219,7 +219,7 @@ export default {
       searchKey: "",
       type: 1,
       page: 1,
-      limit: 7,
+      limit: 10,
       checked: false,
       total: 0,
       pageTotal: 0,

src/xt_pages/stock/config/dealer.vue

@@ -103,8 +103,8 @@
         <el-pagination
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
-          :page-sizes="[7]"
-          :page-size="7"
+          :page-sizes="[10,50,100]"
+          :page-size="10"
           background
           align="right"
           style="margin-top:20px;"
@@ -141,7 +141,7 @@ export default {
       pageTotal: 0,
       pageSelect: 0,
       page: 1,
-      limit: 7,
+      limit: 10,
 
       loading: false,
 

src/xt_pages/stock/config/goodInfo.vue

@@ -121,8 +121,8 @@
     <el-pagination
       @size-change="handleSizeChange"
       @current-change="handleCurrentChange"
-      :page-sizes="[7]"
-      :page-size="7"
+      :page-sizes="[10, 50, 100]"
+      :page-size="10"
       background
       align="right"
       style="margin-top:20px;"
@@ -159,7 +159,7 @@ export default {
       pageTotal: 0,
       pageSelect: 0,
       page: 1,
-      limit: 7,
+      limit: 10,
       keywords: "",
       goodInfo: {
         loading: false,

src/xt_pages/stock/config/goodType.vue

@@ -124,8 +124,8 @@
         <el-pagination
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
-          :page-sizes="[7]"
-          :page-size="7"
+          :page-sizes="[10, 50, 100]"
+          :page-size="10"
           background
           align="right"
           style="margin-top:20px;"
@@ -232,7 +232,7 @@ export default {
       pageTotal: 0,
       pageSelect: 0,
       page: 1,
-      limit: 7,
+      limit: 10,
       keywords: "",
       goodType: {
         loading: false,

src/xt_pages/stock/config/manufacturer.vue

@@ -103,8 +103,8 @@
           <el-pagination
             @size-change="handleSizeChange"
             @current-change="handleCurrentChange"
-            :page-sizes="[7]"
-            :page-size="7"
+            :page-sizes="[10, 50, 100]"
+            :page-size="10"
             background
             align="right"
             style="margin-top:20px;"
@@ -142,7 +142,7 @@ export default {
       pageSelect: 0,
 
       page: 1,
-      limit: 7,
+      limit: 10,
       loading: false,
 
       manufacturer_code: "",

src/xt_pages/stock/detail/cancelStockDetail.vue

@@ -154,8 +154,8 @@
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[7, 10, 50, 100]"
-        :page-size="7"
+        :page-sizes="[10, 50, 100]"
+        :page-size="10"
         background
         style="margin-top:20px;float: right"
         layout="total, sizes, prev, pager, next, jumper"
@@ -211,7 +211,7 @@ export default {
       searchKey: "",
       type: 4,
       page: 1,
-      limit: 7,
+      limit: 10,
       checked: false,
       total: 0,
       pageTotal: 0,

src/xt_pages/stock/detail/salesReturnDetail.vue

@@ -154,8 +154,8 @@
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[7, 10, 50, 100]"
-        :page-size="7"
+        :page-sizes="[10, 50, 100]"
+        :page-size="10"
         background
         style="margin-top:20px;float: right"
         layout="total, sizes, prev, pager, next, jumper"
@@ -211,7 +211,7 @@ export default {
       searchKey: "",
       type: 3,
       page: 1,
-      limit: 7,
+      limit: 10,
       checked: false,
       total: 0,
       pageTotal: 0,

src/xt_pages/stock/detail/stockInDetail.vue

@@ -167,8 +167,8 @@
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[7, 10, 50, 100]"
-        :page-size="7"
+        :page-sizes="[10, 50, 100]"
+        :page-size="10"
         background
         style="margin-top:20px;float: right"
         layout="total, sizes, prev, pager, next, jumper"
@@ -228,7 +228,7 @@ export default {
       searchKey: "",
       type: 1,
       page: 1,
-      limit: 7,
+      limit: 10,
       manufacturer_id: "",
       dealer_id: "",
       order_type: "",

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -166,8 +166,8 @@
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[7, 10, 50, 100]"
-        :page-size="7"
+        :page-sizes="[10, 50, 100]"
+        :page-size="10"
         background
         style="margin-top:20px;float: right"
         layout="total, sizes, prev, pager, next, jumper"
@@ -224,7 +224,7 @@ export default {
       searchKey: "",
       type: 2,
       page: 1,
-      limit: 7,
+      limit: 10,
       checked: false,
       total: 0,
       pageTotal: 0,

src/xt_pages/stock/otherCancelStockOrder.vue

@@ -158,8 +158,8 @@
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[7, 10, 50, 100]"
-        :page-size="7"
+        :page-sizes="[10, 50, 100]"
+        :page-size="10"
         background
         style="margin-top:20px;float: right"
         layout="total, sizes, prev, pager, next, jumper"
@@ -217,7 +217,7 @@ export default {
       searchKey: "",
       type: 2,
       page: 1,
-      limit: 7,
+      limit: 10,
       checked: false,
       total: 0,
       pageTotal: 0,

src/xt_pages/stock/otherSalesReturnOrder.vue

@@ -160,8 +160,8 @@
         <el-pagination
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
-          :page-sizes="[7, 10, 50, 100]"
-          :page-size="7"
+          :page-sizes="[10, 50, 100]"
+          :page-size="10"
           background
           style="margin-top:20px;float: right"
           layout="total, sizes, prev, pager, next, jumper"
@@ -222,7 +222,7 @@ export default {
       ],
       type: 2,
       page: 1,
-      limit: 7,
+      limit: 10,
       checked: false,
       total: 0,
       pageTotal: 0,

src/xt_pages/stock/otherStockInOrder.vue

@@ -162,8 +162,8 @@
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[7, 10, 50, 100]"
-        :page-size="7"
+        :page-sizes="[10, 50, 100]"
+        :page-size="10"
         background
         style="margin-top:20px;float: right"
         layout="total, sizes, prev, pager, next, jumper"
@@ -223,7 +223,7 @@ export default {
         { path: false, name: "其他入库单" }
       ],
       page: 1,
-      limit: 7,
+      limit: 10,
       checked: false,
       total: 0,
       pageTotal: 0,

src/xt_pages/stock/otherStockOutOrder.vue

@@ -156,8 +156,8 @@
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[7, 10, 50, 100]"
-        :page-size="7"
+        :page-sizes="[10, 50, 100]"
+        :page-size="10"
         background
         style="margin-top:20px;float: right"
         layout="total, sizes, prev, pager, next, jumper"
@@ -215,7 +215,7 @@ export default {
       ],
       searchKey: "",
       page: 1,
-      limit: 7,
+      limit: 10,
       checked: false,
       total: 0,
       pageTotal: 0,

src/xt_pages/stock/salesReturnOrder.vue

@@ -156,8 +156,8 @@
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[7, 10, 50, 100]"
-        :page-size="7"
+        :page-sizes="[10, 50, 100]"
+        :page-size="10"
         background
         style="margin-top:20px;float: right"
         layout="total, sizes, prev, pager, next, jumper"
@@ -218,7 +218,7 @@ export default {
       ],
       type: 1,
       page: 1,
-      limit: 7,
+      limit: 10,
       checked: false,
       total: 0,
       pageTotal: 0,

src/xt_pages/stock/stockInOrder.vue

@@ -161,8 +161,8 @@
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[7, 10, 50, 100]"
-        :page-size="7"
+        :page-sizes="[10, 50, 100]"
+        :page-size="10"
         background
         style="margin-top:20px;float: right"
         layout="total, sizes, prev, pager, next, jumper"
@@ -254,7 +254,7 @@ export default {
       searchKey: "",
       type: 1,
       page: 1,
-      limit: 7,
+      limit: 10,
       checked: false,
       total: 0,
       pageTotal: 0,

src/xt_pages/stock/stockOutOrder.vue

@@ -155,8 +155,8 @@
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[7, 10, 50, 100]"
-        :page-size="7"
+        :page-sizes="[10, 50, 100]"
+        :page-size="10"
         background
         style="margin-top:20px;float: right"
         layout="total, sizes, prev, pager, next, jumper"
@@ -214,7 +214,7 @@ export default {
         { path: false, name: "出库单" }
       ],
       page: 1,
-      limit: 7,
+      limit: 10,
       checked: false,
       total: 0,
       pageTotal: 0,

src/xt_pages/stock/stockQuery.vue

@@ -109,8 +109,8 @@
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[7, 10, 50, 100]"
-        :page-size="7"
+        :page-sizes="[10, 50, 100]"
+        :page-size="10"
         background
         align="right"
         style="margin-top:20px;"
@@ -154,7 +154,7 @@ export default {
       start_time: "",
       end_time: "",
       page: 1,
-      limit: 7,
+      limit: 10,
       goodType: [],
       goodInfo: [],
       WarehouseInfo: {

src/xt_pages/user/dialysisRecord.vue

@@ -117,7 +117,7 @@
             <template slot-scope="scope"
               ><span
                 >{{ scope.row.partition_name }}-{{
-                  scope.row.device_number
+                  scope.row.device.number
                 }}</span
               ></template
             >
@@ -140,7 +140,7 @@
           >
           </el-table-column>
           <el-table-column
-            prop="prescription.dry_weight"
+            prop="predialysis_evaluation.dry_weight"
             width="96"
             align="center"
             label="干体重(kg)"
@@ -192,25 +192,19 @@
               ></template
             >
           </el-table-column>
-          <el-table-column
-            prop="predialysis_evaluation.ultrafiltration_amount"
-            width="110"
-            align="center"
-            label="超滤总量(L)"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="access"
-            width="100"
-            align="center"
-            label="血管通路"
-          >
-            <template slot-scope="scope"
-              ><span>{{
-                setVascularAccess(scope.row.prescription)
-              }}</span></template
-            >
-          </el-table-column>
+
+          <!--<el-table-column-->
+            <!--prop="access"-->
+            <!--width="100"-->
+            <!--align="center"-->
+            <!--label="血管通路"-->
+          <!--&gt;-->
+            <!--<template slot-scope="scope"-->
+              <!--&gt;<span>{{-->
+                <!--setVascularAccess(scope.row.prescription)-->
+              <!--}}</span></template-->
+            <!--&gt;-->
+          <!--</el-table-column>-->
           <el-table-column
             prop="type"
             width="200"
@@ -221,18 +215,18 @@
               <span>{{ setAnticoagulantsConfit(scope.row.prescription) }}</span>
             </template>
           </el-table-column>
-          <el-table-column
-            prop="model"
-            width="100"
-            align="center"
-            label="透析器型号"
-          >
-            <template slot-scope="scope"
-              ><span>{{
-                setDialyzerModel(scope.row.prescription)
-              }}</span></template
-            >
-          </el-table-column>
+          <!--<el-table-column-->
+            <!--prop="model"-->
+            <!--width="100"-->
+            <!--align="center"-->
+            <!--label="透析器型号"-->
+          <!--&gt;-->
+            <!--<template slot-scope="scope"-->
+              <!--&gt;<span>{{-->
+                <!--setDialyzerModel(scope.row.prescription)-->
+              <!--}}</span></template-->
+            <!--&gt;-->
+          <!--</el-table-column>-->
           <el-table-column
             prop="nurse"
             width="90"

src/xt_pages/user/doctorAdvice.vue

@@ -2532,7 +2532,7 @@
           }, 1)
         } else {
           this.$message.error(
-            '请先将医嘱类型切换到长期或临时，将勾选需要打印的医嘱!'
+            '请先将医嘱类型切换到长期或临时，勾选需要打印的医嘱!'
           )
           return false
         }

src/xt_pages/user/patients.vue

@@ -590,13 +590,20 @@ export default {
     var healthcareno = this.healthcareno
 
     // BASE64加密
-    var eid = this.Base64.encode(id)
-    var ename = this.Base64.encode(name)
-    var egender = this.Base64.encode(gender)
-    var eidcardno = this.Base64.encode(idcardno)
-    var ephone = this.Base64.encode(phone)
-    var ehealthcareno = this.Base64.encode(healthcareno)
-    var edialysisno = this.Base64.encode(dialysis_no)
+    // var eid = this.Base64.encode(id)
+    // var ename = this.Base64.encode(name)
+    // var egender = this.Base64.encode(gender)
+    // var eidcardno = this.Base64.encode(idcardno)
+    // var ephone = this.Base64.encode(phone)
+    // var ehealthcareno = this.Base64.encode(healthcareno)
+    // var edialysisno = this.Base64.encode(dialysis_no)
+    var eid = id
+    var ename =name
+    var egender = gender
+    var eidcardno = idcardno
+    var ephone = phone
+    var ehealthcareno = healthcareno
+    var edialysisno = dialysis_no
     console.log('user_id' + eid, 'name:' + ename, 'gender:' + egender, 'idcard_no:' + eidcardno, 'phone:' + ephone, 'healthcare_no:' + ehealthcareno, 'edialysis_no:' + edialysisno)
     const salting = 'admin-authority'
     new QRCode('qrcode', {