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

src/router/modules/dialysis.js

@@ -803,5 +803,17 @@ export default {
         noCache: true
       }
     },
+    {
+      path: '/dialysis/print/batch/fiftyThree',
+      component: () =>
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_fiftyThree'),
+      hidden: true,
+      is_menu: false,
+      name: 'batch_print_order_fiftyThree',
+      meta: {
+        title: '批量打印',
+        noCache: true
+      }
+    },
   ]
 }

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -1429,14 +1429,14 @@
                           </td>
 
                           <td>
-                            <span v-if="org_id == 9671 || org_id == 10440">
+                            <span v-if="org_id == 9671 || org_id == 10440 || org_id == 10471">
                                 {{
                               monitor_record.ultrafiltration_volume
                                 ? monitor_record.ultrafiltration_volume
                                 : "0"
                             }}
                             </span>
-                             <span v-if="org_id!=9671 && org_id!=10440">
+                             <span v-if="org_id!=9671 && org_id!=10440 && org_id!=10471">
                                 {{
                               monitor_record.ultrafiltration_volume
                                 ? monitor_record.ultrafiltration_volume

src/xt_pages/dialysis/batch_print/batch_print_order_thirtySeven.vue

@@ -107,10 +107,12 @@
                             <span style="display:inline-block;width:15%;margin-left:15px;width:100%;">
                                 治疗抗凝:
                                 <label-box :isChecked="record.prescription.anticoagulant == 3 ? true : record.prescription.anticoagulant == 6 ? true : record.prescription.anticoagulant == 7 ? true : false" showValue="低分子肝素"></label-box>
+                                <label-box :isChecked="record.prescription.anticoagulant == 8  ? true : false" showValue="依诺肝素"></label-box>
                                 <span style="display:inline-block;width:50px;">
                                     <span v-if="record.prescription.anticoagulant == 3">{{ record.prescription.anticoagulant_zongliang }}</span>
                                     <span v-if="record.prescription.anticoagulant == 6">{{ record.prescription.anticoagulant_zongliang }}</span>
                                     <span v-if="record.prescription.anticoagulant == 7">{{ record.prescription.anticoagulant_zongliang }}</span>
+                                    <span v-if="record.prescription.anticoagulant == 8">{{ record.prescription.anticoagulant_zongliang }}</span>
                                 </span>U
                                 <span style="margin:0 10px;">
                                     <label-box :isChecked="record.prescription.anticoagulant == 2 ? true : false" showValue="普通肝素"></label-box>

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -337,6 +337,15 @@
           @click="batchPrintAction"
           type="primary"
           >批量打印</el-button>
+      </template>
+         <template v-if="this.template_id == 53">
+        <el-button
+          size="small"
+          icon="el-icon-printer"
+          :disabled="selecting_schs.length == 0"
+          @click="batchPrintAction"
+          type="primary"
+          >批量打印</el-button>
       </template>
       <template v-if="this.template_id == 59">
         <el-button
@@ -2106,6 +2115,8 @@ export default {
         this.$router.push({ path: "/dialysis/print/batch/six" });
       }else if (this.template_id == 51) {
         this.$router.push({ path: "/dialysis/print/batch/fiftyOne" });
+      }else if (this.template_id == 53) {
+        this.$router.push({ path: "/dialysis/print/batch/fiftyThree" });
       }else if (this.template_id == 59) {
         this.$router.push({ path: "/dialysis/print/batch/fiftynine" });
       }else if (this.template_id == 60) {

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -1493,8 +1493,8 @@
                       
 
                         <td>
-                          <span v-if="org_id!=9671 && org_id!=10440"> {{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: ""}}</span>
-                          <span v-if="org_id==9671 || org_id==10440"> {{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "0"}}</span>
+                          <span v-if="org_id!=9671 && org_id!=10440 && org_id!=10471"> {{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: ""}}</span>
+                          <span v-if="org_id==9671 || org_id==10440 || org_id == 10471"> {{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "0"}}</span>
                         </td>
                         <!-- <td style="width:50px">
                           <span v-if="(prescription.mode_id == 2 || prescription.mode_id == 5 || prescription.mode_id == 12) && ((dialysisOrder && monitor.operate_time <= dialysisOrder.end_time) && (dialysisOrder && monitor.operate_time >= dialysisOrder.start_time))">

src/xt_pages/dialysis/template/DialysisPrintOrderThirtySeven.vue

@@ -94,10 +94,12 @@
                   <span style="display:inline-block;width:15%;margin-left:15px;width:100%;">
                       治疗抗凝:
                       <label-box :isChecked="prescription.anticoagulant == 3 ? true : prescription.anticoagulant == 6 ? true : prescription.anticoagulant == 7 ? true : false" showValue="低分子肝素"></label-box>
+                      <label-box :isChecked="prescription.anticoagulant == 8 ? true : false" showValue="依诺肝素"></label-box>
                       <span style="display:inline-block;width:50px;">
                           <span v-if="prescription.anticoagulant == 3">{{ prescription.anticoagulant_zongliang }}</span>
                           <span v-if="prescription.anticoagulant == 6">{{ prescription.anticoagulant_zongliang }}</span>
                           <span v-if="prescription.anticoagulant == 7">{{ prescription.anticoagulant_zongliang }}</span>
+                          <span v-if="prescription.anticoagulant == 8">{{ prescription.anticoagulant_zongliang }}</span>
                       </span>U
                       <span style="margin:0 10px;">
                           <label-box :isChecked="prescription.anticoagulant == 2 ? true : false" showValue="普通肝素"></label-box>

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyFour.vue

@@ -605,7 +605,17 @@
                           <tr>
                               <td width='70'>抗凝方式</td>
                               <td width='100'>
-                                  <label-box :isChecked="prescription.anticoagulant == 3 ? true : prescription.anticoagulant == 6 ? true : prescription.anticoagulant == 7 ? true : false" showValue="低分子肝素"></label-box>
+                                  <label-box :isChecked="prescription.anticoagulant == 3 ? true : false" showValue="低分子肝素"></label-box>
+                                  <label-box :isChecked="prescription.anticoagulant == 4 ? true : false" showValue="阿加曲班"></label-box>
+                                  <label-box :isChecked="prescription.anticoagulant == 5 ? true : false" showValue="枸橼酸钠"></label-box>
+                                  <label-box :isChecked="prescription.anticoagulant == 6 ? true : false" showValue="低分子肝素钙"></label-box>
+                                  <label-box :isChecked="prescription.anticoagulant == 7 ? true : false" showValue="低分子肝素钠"></label-box>
+                                  <label-box :isChecked="prescription.anticoagulant == 8 ? true : false" showValue="依诺肝素"></label-box>
+                                  <label-box :isChecked="prescription.anticoagulant == 9 ? true : false" showValue="达肝素"></label-box>
+                                  <label-box :isChecked="prescription.anticoagulant == 10 ? true : false" showValue="体外抗凝"></label-box>
+                                  <label-box :isChecked="prescription.anticoagulant == 11 ? true : false" showValue="那屈肝素"></label-box>
+                                  <label-box :isChecked="prescription.anticoagulant == 12 ? true : false" showValue="无抗凝剂"></label-box>
+                                  <label-box :isChecked="prescription.anticoagulant == 13 ? true : false" showValue="那屈肝素钙"></label-box>
                               </td>
                               <!-- <td width='100'>
                                   <div class="under-line">

src/xt_pages/management/components/UserForm.vue

@@ -684,7 +684,7 @@
               >桶
             </el-form-item>
             <span style="color:red" v-show="showone"
-              >您已一个月未更换,请注意检测</span
+              >您已三个月未更换,请注意检测</span
             >
           </el-col>
         </el-row>
@@ -711,7 +711,7 @@
             >
               <el-checkbox v-model="userform.germ_checked">更换</el-checkbox>
               <span style="color:red" v-show="showone"
-                >您已一个月未更换,请注意检测</span
+                >您已三个月未更换,请注意检测</span
               >
             </el-form-item>
           </el-col>
@@ -750,7 +750,7 @@
             >
               <el-checkbox v-model="userform.clean">清洁:</el-checkbox>
               <span style="color:red" v-show="showone"
-                >您已一个月未清洁,请检查</span
+                >您已三个月未清洁,请检查</span
               >
             </el-form-item>
           </el-col>

src/xt_pages/management/home.vue

@@ -1275,7 +1275,7 @@
                                       <el-form-item label="规格:">
                                           <el-input style="width:100px" v-model="userform.norms"></el-input><span style="color:#606266;">桶</span>
                                       </el-form-item>
-                                       <span class="warn" v-show="warnShow">您已一个月未更换,请注意检测</span>
+                                       <span class="warn" v-show="warnShow">您已三个月未更换,请注意检测</span>
                                    </el-col>
                                 </el-row>
                                 <el-row>
@@ -1292,7 +1292,7 @@
                                    <el-col :span="8">
                                      <el-form-item label="细菌过滤器:">
                                        <el-checkbox v-model="userform.germ_checked">更换</el-checkbox>
-                                       <span class="warn" v-show="warnShowTwo">您已一个月未更换,请注意检测</span>
+                                       <span class="warn" v-show="warnShowTwo">您已三个月未更换,请注意检测</span>
                                      </el-form-item>
 
                                      </el-col>

src/xt_pages/outpatientTool/yidiClear.vue

@@ -11,6 +11,7 @@
         <el-date-picker
             v-model="month"
             type="month"
+            value-format="yyyy-MM"
             placeholder="选择年月">
         </el-date-picker>
       </div>
@@ -93,6 +94,7 @@ export default {
   methods: {
     getYidiClear(){
       var that = this;
+      console.log(this.month)
       let params = {
         'year':this.month.split("-")[0],
         'month':this.month.split("-")[1],

src/xt_pages/user/coursePrint.vue

@@ -61,7 +61,7 @@
               </div>
             </div>
 
-            <div class="row" style="padding: 2px 0;line-height:24px;margin-top:10px;float:right" v-if="org_id == 0||org_id ==9671 || org_id == 10440">
+            <div class="row" style="padding: 2px 0;line-height:24px;margin-top:10px;float:right" v-if="org_id == 0||org_id ==9671 || org_id == 10440 || org_id == 10131">
              医生签名：
              <span v-if="setAdminUserES(item.recorder?item.recorder:item.recorder) == ''">
                   {{getName(item.recorder)}}