Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/api/role/admin.js

@@ -133,4 +133,22 @@ export function toTestFive(params){
      method:"Get",
      params:params
   })
+}
+
+export function toTestSeven(params){
+ 
+  return request({
+    url:"api/sign/addcontractsignatory",
+    method:"Get",
+    params:params
+  })
+}
+
+export function toTestEight(params){
+  
+  return request({
+    url:"/api/sign/contractsignatory",
+    method:"Get",
+    params:params,
+  })
 }

src/xt_pages/dialysis/batch_print/batch_print_order_fiftyOne.vue

@@ -78,13 +78,14 @@
               <div class="inline_block">
                 病区：
                 <div class="under_line" style="width: 50px; text-align: center">
-                  {{ "/" }}
+                  {{ record.device_zone.name? record.device_zone.name:"/" }}
                 </div>
               </div>
               <div class="inline_block">
                 床号：
                 <div class="under_line" style="width: 50px; text-align: center">
-                  {{ "/" }}
+                 
+                  {{ record.device_number.number? record.device_number.number:"/" }}
                 </div>
               </div>
               <div class="inline_block">

src/xt_pages/dialysis/batch_print/batch_print_order_sixty.vue

@@ -890,7 +890,7 @@
                           class="under_line"
                           style="width: 100px; text-align: center"
                         >
-                          <span v-if="org_id == 10290">{{
+                          <span v-if="org_id == 10290 || org_id == 10138 || org_id == 10278">{{
                             record.lastafterweight.weight_after
                           }}</span>
                           <span v-else>{{

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyFive.vue

@@ -740,7 +740,9 @@
                             class="under_line"
                             style="width: 100px; text-align: center"
                           >
-                            /
+                          {{
+                          getDisplaceLiquiPart(record.prescription.displace_liqui_part)
+                        }}
                           </div>
                         </div>
                         <div
@@ -1887,13 +1889,13 @@
                 <div class="inline_block">
                   病区：
                   <div class="under_line" style="width: 50px; text-align: center">
-                    {{ "/" }}
+                    {{ record.device_zone.name? record.device_zone.name:"/" }}
                   </div>
                 </div>
                 <div class="inline_block">
                   床号：
                   <div class="under_line" style="width: 50px; text-align: center">
-                    {{ "/" }}
+                    {{ record.device_number.number? record.device_number.number:"/" }}
                   </div>
                 </div>
                 <div class="inline_block">
@@ -2909,9 +2911,11 @@
           "腹痛",
         ],
         org_id: "",
+        displaceLiquiPartOptions:[],
       };
     },
     created() {
+      this.displaceLiquiPartOptions = this.$store.getters.displace_liqui;
       var bloodAccessParOpera = getDataConfig(
         "hemodialysis",
         "vascular_access_desc"
@@ -3139,6 +3143,18 @@
         });
     },
     methods: {
+      getDisplaceLiquiPart: function(val) {
+       
+        let displace_liqui_part_name = "/";
+        const displace_liqui_part = this.displaceLiquiPartOptions;
+      
+        for (let i = 0; i < displace_liqui_part.length; i++) {
+           if (displace_liqui_part[i].id == val) {
+           displace_liqui_part_name = displace_liqui_part[i].name;
+        }
+      }
+      return displace_liqui_part_name;
+     },
       getUnit: function (val) {
         if (val.assessment_after_dislysis == null) {
           return "";

src/xt_pages/dialysis/batch_print/batch_print_order_sixtysix.vue

@@ -84,13 +84,13 @@
               <div class="inline_block">
                 病区：
                 <div class="under_line" style="width: 50px; text-align: center">
-                  {{ "/" }}
+                  {{ record.device_zone.name? record.device_zone.name:"/" }}
                 </div>
               </div>
               <div class="inline_block">
                 床号：
                 <div class="under_line" style="width: 50px; text-align: center">
-                  {{ "/" }}
+                  {{ record.device_number.number? record.device_number.number:"/" }}
                 </div>
               </div>
               <div class="inline_block">
@@ -204,14 +204,7 @@
                             class="under_line"
                             style="width: 150px; text-align: center"
                           >
-                            {{
-                              record.assessment_before_dislysis &&
-                              record.assessment_before_dislysis
-                                .symptom_before_dialysis
-                                ? record.assessment_before_dislysis
-                                    .symptom_before_dialysis
-                                : "/"
-                            }}
+                          {{ getTime(record.lastSchedule.schedule_date, "{y}-{m}-{d}") }}
                           </div>
                         </div>
                       </div>
@@ -713,6 +706,7 @@
                         </div>
   
                         <div
+                        v-if="record.prescription.mode_id == 2 ||  record.prescription.mode_id == 5 ||   record.prescription.mode_id == 12 ||  record.prescription.mode_id == 28"
                           class="inline_block"
                           style="margin-left: 10px; flex: 1"
                         >
@@ -725,6 +719,7 @@
                           </div>
                         </div>
                         <div
+                        v-if="record.prescription.mode_id == 2 ||  record.prescription.mode_id == 5 ||   record.prescription.mode_id == 12 ||  record.prescription.mode_id == 28"
                           class="inline_block"
                           style="margin-left: 10px; flex: 1"
                         >
@@ -1160,7 +1155,7 @@
                             >iu</span
                           >
                           <span v-if="record.prescription.anticoagulant == 2"
-                            >iu</span
+                            >mg</span
                           >
                           <span v-if="record.prescription.anticoagulant == 1"
                             >mg</span
@@ -1208,7 +1203,7 @@
                             >iu/h</span
                           >
                           <span v-if="record.prescription.anticoagulant == 2"
-                            >iu/h</span
+                            >mg/h</span
                           >
                           <span v-if="record.prescription.anticoagulant == 1"
                             >mg/h</span
@@ -1234,7 +1229,7 @@
                             >iu</span
                           >
                           <span v-if="record.prescription.anticoagulant == 2"
-                            >iu</span
+                            >mg</span
                           >
                           <span v-if="record.prescription.anticoagulant == 1"
                             >mg</span

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

@@ -1284,7 +1284,7 @@
             </span>
           </el-row>
         </el-form>
-      
+
       </span>
       <span slot="footer" class="dialog-footer">
         <el-button @click="infoDialogVisible = false">取 消</el-button>

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

@@ -243,7 +243,8 @@
                 || org_id == 10410 ||
                 org_id == 10495 ||
                 org_id == 10375 ||
-                org_id == 10485) &&
+                org_id == 10485 ||
+                org_id == 10375) &&
                 org_id!=10387
             "
           >
@@ -313,7 +314,7 @@
               org_id != 9555
               && org_id!=10432 && org_id!=10445
               && org_id!=10410 && org_id!=10495 &&
-               org_id!=10485 && org_id!=10395 )
+               org_id!=10485 && org_id!=10395 && org_id!=10375 )
               || org_id == 10387
             "
           >
@@ -369,7 +370,7 @@
                 org_id == 10410 ||
                 org_id == 10495  ||
                 org_id == 10395
-                || org_id == 10485)
+                || org_id == 10485 || org_id == 10375)
                 && org_id!=10387
             "
           >
@@ -422,7 +423,7 @@
               org_id!=10432 &&
               org_id!=10445 &&
               org_id!=10410 && org_id!=10495
-              && org_id!=10485 && org_id!=10395) ||
+              && org_id!=10485 && org_id!=10395 && org_id!=10375) ||
               org_id == 10387
             "
           >
@@ -1147,7 +1148,7 @@
                 org_id== 10432 ||
                 org_id== 10445 ||
                 org_id== 10410 ||
-                org_id == 10485) &&
+                org_id == 10485 || org_id == 10375) &&
                 org_id!=10387
             "
           >
@@ -1194,7 +1195,8 @@
               org_id!=10432 &&
               org_id!=10445 &&
               org_id!=10410 &&
-              org_id!=10485)
+              org_id!=10485 &&
+              org_id!=10375)
               || org_id == 10387
             "
           >
@@ -1252,7 +1254,8 @@
                 org_id == 10410 ||
                 org_id == 10495 ||
                 org_id == 10485 ||
-                org_id == 10395)
+                org_id == 10395 ||
+                org_id == 10375)
                 && org_id!=10387
             "
           >
@@ -1310,7 +1313,8 @@
               org_id!=10410 &&
               org_id!=10495 &&
               org_id!=10485 &&
-              org_id!=10395
+              org_id!=10395 &&
+              org_id!=10375
               )
               || org_id == 10387
             "

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -14,10 +14,10 @@
           <th width="76px">静脉压/动脉压({{monitores[0]&&monitores[0]['venous_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
           <th v-if="isShow('血流量')" 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('超滤量') &&(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!=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 == 10387"  width="76px"> 超滤量(L) </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!=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==10387" width="50px"> 超滤率 <br />(L/h) </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!=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 == 10387"  width="76px"> 超滤量(L) </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!=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==10387" width="50px"> 超滤率 <br />(L/h) </th>
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
           <th v-if="isShow('透析液温度')" width="92px">透析液温度(℃)</th>
           <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || 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 || org_id == 10432 || org_id == 10445 || org_id == 10410) " width="92px" > 置换率(ml/min) </th>

src/xt_pages/dialysis/template/DialysisPrintOrderEight.vue

@@ -777,7 +777,7 @@
             <td>{{ monitor.blood_flow_volume }}</td>
             <td>{{ monitor.venous_pressure }}</td>
             <td>{{ monitor.transmembrane_pressure }}</td>
-            <td>{{ monitor.ultrafiltration_rate }}</td>//
+            <td>{{ monitor.ultrafiltration_rate }}</td>
             <td>{{ monitor.ultrafiltration_volume }}</td>
             <td>{{ monitor.sodium_concentration }}</td>
             <td>

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyOne.vue

@@ -80,11 +80,11 @@
                       class="under_line"
                       style="width: 50px; text-align: center"
                     >
-                      <span>{{
-                        patientInfo.DialysisSchedule.device_zone.name
-                          ? patientInfo.DialysisSchedule.device_zone.name
-                          : ""
-                      }}</span>
+                    <span>{{
+                      patientInfo.DialysisSchedule.device_zone.name
+                        ? patientInfo.DialysisSchedule.device_zone.name
+                        : "/"
+                    }}</span>
                     </div>
                   </div>
                   <div
@@ -100,38 +100,16 @@
                       class="under_line"
                       style="width: 50px; text-align: center"
                     >
-                      <!-- <span>{{
-                        (dialysisOrder &&
-                          dialysisOrder != null &&
-                          dialysisOrder.DeviceNumber &&
-                          dialysisOrder.DeviceNumber.number.length > 0) ||
-                        (dialysisOrder &&
-                          dialysisOrder != null &&
-                          receiverTreatmentAccess.condition &&
-                          receiverTreatmentAccess.condition != 1)
-                          ? patientInfo.DialysisSchedule.device_number.number
-                          : dialysisOrder.DeviceNumber.number
-                      }}</span> -->
-
-                      <span
-                        v-if="
-                          dialysisOrder == null ||
-                          receiverTreatmentAccess.condition != 1
-                        "
-                      >
-                        {{ patientInfo.DialysisSchedule.device_number.number }}
-                      </span>
-                      <span
-                        v-else-if="
-                          dialysisOrder &&
-                          dialysisOrder != null &&
-                          dialysisOrder.DeviceNumber &&
-                          receiverTreatmentAccess.condition == 1
-                        "
-                      >
-                        {{ dialysisOrder.DeviceNumber.number }}
-                      </span>
-                      <span v-else>/</span>
+                    <span>{{
+                      dialysisOrder &&
+                      dialysisOrder.DeviceNumber &&
+                      dialysisOrder.DeviceNumber.number.length > 0
+                        ? dialysisOrder.DeviceNumber.number
+                        : patientInfo.DialysisSchedule.device_number.number
+                    }}</span>
+              
+
+                     
                     </div>
                   </div>
                   <div

src/xt_pages/dialysis/template/DialysisPrintOrderSixty.vue

@@ -820,10 +820,10 @@
                         class="under_line"
                         style="width: 100px; text-align: center"
                       >
-                        <span v-if="org_id == 10290 || org_id == 10318 || org_id== 10217 || org_id== 10188 || org_id== 9956">{{
+                        <span v-if="org_id == 10290 || org_id == 10318 || org_id== 10217 || org_id== 10188 || org_id== 9956 || org_id == 10138 || org_id == 10278">{{
                           lastafterdialysis.weight_after
                         }}</span>
-                        <span v-if="org_id != 10290 && org_id != 10318  && org_id!= 10217 && org_id!=10188 && org_id!=9956">{{
+                        <span v-if="org_id != 10290 && org_id != 10318  && org_id!= 10217 && org_id!=10188 && org_id!=9956 && org_id!=10138&&org_id!=10278">{{
                           predialysis.weight_after_last_transparency
                             ? predialysis.weight_after_last_transparency
                             : "未称重"

src/xt_pages/dialysis/template/DialysisPrintOrderSixtysix.vue

@@ -80,25 +80,25 @@
             <div class="inline_block">
               病区：
               <div class="under_line" style="width: 50px; text-align: center">
-                <span v-if="org_id == 10121||org_id == 10138||org_id == 10414 ||org_id == 10447">{{
+                <span>{{
                   patientInfo.DialysisSchedule.device_zone.name
                     ? patientInfo.DialysisSchedule.device_zone.name
-                    : ""
+                    : "/"
                 }}</span>
-                <span v-else>{{ "/" }}</span>
+               
               </div>
             </div>
             <div class="inline_block">
               床号：
               <div class="under_line" style="width: 50px; text-align: center">
-                <span v-if="org_id == 10121||org_id == 10414 || org_id == 10447 || org_id == 9675">{{
+                <span>{{
                   dialysisOrder &&
                   dialysisOrder.DeviceNumber &&
                   dialysisOrder.DeviceNumber.number.length > 0
                     ? dialysisOrder.DeviceNumber.number
                     : patientInfo.DialysisSchedule.device_number.number
                 }}</span>
-                <span v-else>{{ "/" }}</span>
+               
               </div>
             </div>
             <div class="inline_block">
@@ -222,11 +222,7 @@
                           class="under_line"
                           style="width: 150px; text-align: center"
                         >
-                          <!-- {{
-                            predialysis.symptom_before_dialysis
-                              ? predialysis.symptom_before_dialysis
-                              : "/"
-                          }} -->
+                          {{getTimeOne(lastSchedule.schedule_date)  }}
                         </div>
                       </div>
                     </div>
@@ -725,6 +721,7 @@
                       </div>
   
                       <div
+                        v-if="prescription.mode_id == 2 || prescription.mode_id == 5 || prescription.mode_id == 12 || prescription.mode_id == 28"
                         class="inline_block"
                         style="margin-left: 10px; flex: 1"
                       >
@@ -732,6 +729,7 @@
                         <div
                           class="under_line"
                           style="width: 100px; text-align: center"
+                          
                         >
                           {{
                             getDisplaceLiquiPart(prescription.displace_liqui_part)
@@ -739,7 +737,7 @@
                         </div>
                       </div>
                       <div
-                       
+                        v-if="prescription.mode_id == 2 || prescription.mode_id == 5 || prescription.mode_id == 12 || prescription.mode_id == 28"
                         class="inline_block"
                         style="margin-left: 10px; flex: 1"
                       >
@@ -1105,7 +1103,7 @@
                        <span v-if="org_id!=9675 && org_id!=10447 && org_id!=9829 && org_id!=10440 && org_id!=10469 && org_id!=10471">
                         <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 == 2">mg</span>
                         <span v-if="prescription.anticoagulant == 1">mg</span>
                       </span>
   
@@ -1153,7 +1151,7 @@
                           <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 == 2">mg/h</span>
                             <span v-if="prescription.anticoagulant == 1">mg/h</span>
                         </span>
                         <span v-if="org_id==9675 || org_id==10447 || org_id== 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471">
@@ -1224,7 +1222,7 @@
                         <span v-if="org_id!=9675 && org_id!=10447 && org_id!=9829 && org_id!=10440 && org_id!=10469 && org_id!=10471">
                         <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 == 2">mg</span>
                         <span v-if="prescription.anticoagulant == 1">mg</span>
                        </span>
                       <span v-if="org_id==9675 || org_id==10447 || org_id == 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471">
@@ -3151,6 +3149,7 @@
           gaijiliang_unit: "",
         },
         org_id: 0,
+        lastSchedule:{},
       };
     },
     methods: {
@@ -3452,6 +3451,17 @@
         }
         return "";
       },
+     
+      getTimeOne(val) {
+         if(val < 0){
+           return ""
+         }
+         if(val == ""){
+          return ""
+         }else {
+          return uParseTime(val, '{y}-{m}-{d}')
+         }
+      },
       getUnit: function (val) {
         switch (val) {
           case 1:
@@ -3582,6 +3592,8 @@
               ? null
               : response.data.data.dialysisOrder;
           // console.log("上机233232323232", this.dialysisOrder);
+
+          this.lastSchedule = response.data.data.lastSchedule
           if (this.operators.length > 0) {
             var operatorsLen = this.operators.length;
             for (var index = 0; index < operatorsLen; index++) {
@@ -3898,7 +3910,10 @@
             }
             this.doctor_advices = doctor_advices_1;
             this.doctor_advices_2 = doctor_advices_2;
+
+
           }
+
           // console.log(this.advice_groups);
         } else {
           this.loading = false;

src/xt_pages/management/components/ManageForm.vue

@@ -750,6 +750,9 @@ export default {
       if (this.form.revers_mode === "") {
         this.form.revers_mode = 0;
       }
+      if(this.form.zone_id == ""){
+         this.form.zone_id = 0
+      }
       this.$refs[formName].validate(valid => {
         if (valid) {
           SaveManageInfo(this.form).then(response => {
@@ -817,7 +820,11 @@ export default {
       var disinfecction_modes = this.form.Disinfection_mode;
       var disinfecction_modess = parseInt(disinfecction_modes);
       this.form.Disinfection_mode = disinfecction_modess;
-
+      if(this.form.zone_id == ""){
+         this.form.zone_id = 0
+      }
+    
+      console.log("form23232wo",this.form)
       this.$refs[formName].validate(valid => {
         if (valid) {
           SaveManageInfoTwo(this.form, this.forms.beds).then(response => {

src/xt_pages/management/home.vue

@@ -3783,6 +3783,10 @@ export default {
         var disinfecction_modess = parseInt(disinfecction_modes)
         this.form.Disinfection_mode = disinfecction_modess
 
+        if (this.form.zone_id === '') {
+          this.form.zone_id = 0
+        }
+
         this.$refs[formName].validate(valid => {
           if (valid) {
             UpdateMachineInfoTwo(this.form).then(response => {

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -1113,8 +1113,6 @@ export default {
         { value: '1402', label: '门诊特殊病(1402)' },
         { value: '1401', label: '门诊慢性病(1401)' },
         { value: '2302', label: '异地就医(2302)' },
-
-
         { value: '0', label: '自费' }
 
       ],
@@ -4866,6 +4864,9 @@ export default {
         case 1401:
           return '门诊慢性病(1401)' + '处方' + index
           break
+        case 2302:
+          return '异地就医(2302)' + '处方' + index
+          break
         case 9922:
           return '家庭通道' + '处方' + index
           break

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -1767,7 +1767,7 @@ export default {
               // }
 
               var preTime = nowTime
-              if ( this.org_id != 0 && this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485){
+              if ( this.org_id != 0 && this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485 && this.$store.getters.xt_user.org.id != 10191){
                 if (prescription.pre_time == 0) {
                   if (this.schedule.schedule_type == 1) {
                     preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
@@ -1924,7 +1924,7 @@ export default {
                   tempProject.push(obj)
                 }
                 var preTime = nowTime
-                if (this.org_id != 0 && this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485) {
+                if (this.org_id != 0 && this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485 && this.$store.getters.xt_user.org.id != 10191) {
                   if (this.schedule.schedule_type == 1) {
                      preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
                   } else if (this.schedule.schedule_type == 2) {
@@ -2234,7 +2234,7 @@ export default {
                     // }
 
                     var preTime = nowTime
-                    if (this.org_id != 0 && this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485 ) {
+                    if (this.org_id != 0 && this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485 && this.$store.getters.xt_user.org.id != 10191 ) {
                       if (prescription.pre_time == 0) {
                         if (this.schedule.schedule_type == 1) {
                           preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
@@ -2392,7 +2392,7 @@ export default {
 
                       var preTime = nowTime
                       // var preTime = ''
-                      if(this.org_id != 0 && this.org_id !=  9919 && this.org_id !=  10485) {
+                      if(this.org_id != 0 && this.org_id !=  9919 && this.org_id !=  10485 && this.org_id !=  10191) {
                         if (this.schedule.schedule_type == 1) {
                           preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
                         } else if (this.schedule.schedule_type == 2) {
@@ -3898,7 +3898,7 @@ export default {
 
                     var preTime = nowTime
 
-                    if(this.org_id != 0 && this.org_id != 9919 && this.org_id  != 10485 ) {
+                    if(this.org_id != 0 && this.org_id != 9919 && this.org_id  != 10485 && this.org_id  != 10191 ) {
                       if (prescription.pre_time == 0) {
                         if (this.schedule.schedule_type == 1) {
                           preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
@@ -4052,7 +4052,7 @@ export default {
 
                       // var preTime = nowTime
                       var preTime = nowTime
-                      if( this.org_id != 0 && this.org_id != 9919 &&  this.org_id != 10485) {
+                      if( this.org_id != 0 && this.org_id != 9919 &&  this.org_id != 10485 &&  this.org_id != 10191) {
                         if (this.schedule.schedule_type == 1) {
                           preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
                         } else if (this.schedule.schedule_type == 2) {
@@ -4535,7 +4535,7 @@ export default {
 
                     var preTime = nowTime
 
-                    if(this.org_id != 0 && this.org_id != 9919 && this.org_id != 10485) {
+                    if(this.org_id != 0 && this.org_id != 9919 && this.org_id != 10485 && this.org_id != 10191) {
                       if (prescription.pre_time == 0) {
                         // preTime = nowTime
                         if (this.schedule.schedule_type == 1) {
@@ -4692,7 +4692,7 @@ export default {
 
                       var preTime = nowTime
                       // var preTime = ''
-                      if(this.org_id != 0 && this.org_id != 9919  && this.org_id != 10485) {
+                      if(this.org_id != 0 && this.org_id != 9919  && this.org_id != 10485 && this.org_id != 10191 ) {
                         if (this.schedule.schedule_type == 1) {
                           preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
                         } else if (this.schedule.schedule_type == 2) {

src/xt_pages/qcd/indicatorControlAnalysis/components/office.vue

@@ -21,7 +21,7 @@
           v-for="item in item_columns"
           :key="item.id"
           :label="item.item_name"
-          :value="item.id"
+          :value="item.item_id"
         ></el-option>
       </el-select>
 
@@ -308,14 +308,14 @@
           }
         }
         this.item_columns = item_inspection_reference
-        
-        var projectInfo = this.getPojectInfo(this.item_columns[0].project_id, this.item_columns[0].id)
+
+        var projectInfo = this.getPojectInfo(this.item_columns[0].project_id, this.item_columns[0].item_id)
         console.log("projectInfo",projectInfo)
         this.query.project_id = projectInfo.project_id
-        this.query.item_id = projectInfo.id
+        this.query.item_id = projectInfo.item_id
         this.item_name = projectInfo.item_name
         this.query.range_type = projectInfo.range_type
-        this.GetRangeValue(projectInfo.range_type, projectInfo.project_id, projectInfo.id)
+        this.GetRangeValue(projectInfo.range_type, projectInfo.project_id, projectInfo.item_id)
 
       }, changeItem(val) {
         this.query.page = 1
@@ -324,7 +324,7 @@
         console.log(projectInfo)
         this.item_name = projectInfo.item_name
 
-        this.GetRangeValue(projectInfo.range_type, projectInfo.project_id, projectInfo.id)
+        this.GetRangeValue(projectInfo.range_type, projectInfo.project_id, projectInfo.item_id)
 
       }, changeRangeValue(val) {
         this.query.range_value = val
@@ -340,7 +340,13 @@
               let project = []
               let item = []
               this.all_inspection_reference = resp.data.references
-               console.log("====hhh",this.all_inspection_reference)
+
+              for(let i = 0; i <  this.all_inspection_reference.length; i++){
+                if(this.all_inspection_reference[i].org_id == 0){
+                  this.all_inspection_reference[i].item_id = this.all_inspection_reference[i].id
+                }
+              }
+
               for (let i = 0; i < this.all_inspection_reference.length; i++) {
                 project.push(this.all_inspection_reference[i])
               }
@@ -362,11 +368,11 @@
               this.item_columns = item
               this.item_name = item[0].item_name
 
-              var projectInfo = this.getPojectInfo(this.project_columns[0].project_id, this.item_columns[0].id)
+              var projectInfo = this.getPojectInfo(this.project_columns[0].project_id, this.item_columns[0].item_id)
               this.query.project_id = projectInfo.project_id
-              this.query.item_id = projectInfo.id
+              this.query.item_id = projectInfo.item_id
               this.query.range_type = projectInfo.range_type
-              this.GetRangeValue(projectInfo.range_type, projectInfo.project_id, projectInfo.id)
+              this.GetRangeValue(projectInfo.range_type, projectInfo.project_id, projectInfo.item_id)
             } else {
               this.$message.error(resp.msg)
 
@@ -379,7 +385,7 @@
       },
       getPojectInfo(project_id, item_id) {
         for (let i = 0; i < this.all_inspection_reference.length; i++) {
-          if (this.all_inspection_reference[i].project_id == project_id && this.all_inspection_reference[i].id == item_id) {
+          if (this.all_inspection_reference[i].project_id == project_id && this.all_inspection_reference[i].item_id == item_id) {
             return this.all_inspection_reference[i]
           }
         }

src/xt_pages/qcd/indicatorControlAnalysis/components/personal.vue

@@ -345,9 +345,9 @@
                       { offset: 1, color: colorList[index][1] }
                     ])
                   },
-                  lineStyle:{ 
+                  lineStyle:{
                     color:'#409eff' //改变折线颜色
-                  }, 
+                  },
                   barBorderRadius: [5, 5, 0, 0] //柱状角成椭圆形
                 },
 
@@ -461,19 +461,19 @@
           }
         }
         this.item_columns = item_inspection_reference
-        var projectInfo = this.getPojectInfo(this.item_columns[0].project_id, this.item_columns[0].id)
+        var projectInfo = this.getPojectInfo(this.item_columns[0].project_id, this.item_columns[0].item_id)
         this.query.project_id = projectInfo.project_id
-        this.query.item_id = projectInfo.id
+        this.query.item_id = projectInfo.item_id
         this.item_name = projectInfo.item_name
         this.query.range_type = projectInfo.range_type
-        this.GetRangeValue(projectInfo.range_type, projectInfo.project_id, projectInfo.id)
+        this.GetRangeValue(projectInfo.range_type, projectInfo.project_id, projectInfo.item_id)
 
       }, changeItem(val) {
         this.query.page = 1
         this.query.item_id = val
         var projectInfo = this.getPojectInfo(this.query.project_id, val)
         this.item_name = projectInfo.item_name
-        this.GetRangeValue(projectInfo.range_type, projectInfo.project_id, projectInfo.id)
+        this.GetRangeValue(projectInfo.range_type, projectInfo.project_id, projectInfo.item_id)
 
       }, changeRangeValue(val) {
         this.query.range_value = val
@@ -490,6 +490,11 @@
               let project = []
               let item = []
               this.all_inspection_reference = resp.data.references
+              for(let i = 0; i <  this.all_inspection_reference.length; i++){
+                if(this.all_inspection_reference[i].org_id == 0){
+                  this.all_inspection_reference[i].item_id = this.all_inspection_reference[i].id
+                }
+              }
 
               for (let i = 0; i < this.all_inspection_reference.length; i++) {
                 project.push(this.all_inspection_reference[i])
@@ -511,11 +516,11 @@
               this.item_columns = item
               this.item_name = item[0].item_name
 
-              var projectInfo = this.getPojectInfo(this.project_columns[0].project_id, this.item_columns[0].id)
+              var projectInfo = this.getPojectInfo(this.project_columns[0].project_id, this.item_columns[0].item_id)
               this.query.project_id = projectInfo.project_id
-              this.query.item_id = projectInfo.id
+              this.query.item_id = projectInfo.item_id
               this.query.range_type = projectInfo.range_type
-              this.GetRangeValue(projectInfo.range_type, projectInfo.project_id, projectInfo.id)
+              this.GetRangeValue(projectInfo.range_type, projectInfo.project_id, projectInfo.item_id)
             } else {
               this.$message.error(resp.msg)
 

src/xt_pages/role/admin.vue

@@ -65,6 +65,13 @@
           icon="el-icon-circle-plus-outline"
           style="float:left"
           @click="toTestSeven">添加合同签署人</el-button> -->
+
+          <!-- <el-button   type="primary"
+          size="small"
+          icon="el-icon-circle-plus-outline"
+          style="float:left"  @click="toTestEight">
+            脚本
+          </el-button> -->
           
      </div>
     
@@ -220,7 +227,7 @@
 </template>
 
 <script>
-import { adminMainView, getAdmins, setAdminStatus,toSign,toTestOne,toTestTwo,toTestThree,toTestFour,toTestFive } from "@/api/role/admin";
+import { adminMainView, getAdmins, setAdminStatus,toSign,toTestOne,toTestTwo,toTestThree,toTestFour,toTestFive,toTestSeven,toTestEight } from "@/api/role/admin";
 import { getRoles } from "@/api/role/role";
 
 import { parseTime } from "@/utils";
@@ -565,6 +572,15 @@ export default {
           console.log("sign",sign)
         }
       })
+    },
+    toTestEight(){
+      toTestEight().then(response=>{
+        if(response.data.state== 1){
+          var sign =  response.data.data.sign
+          console.log("sign",sign)
+           this.$message.success("保存")
+        }
+      })
     }
   },
   watch: {

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -809,7 +809,7 @@ export default {
         this.tableOut[i].specification_name = this.tableOut[i].specification_name
         this.tableOut[i].packing_unit = this.tableOut[i].packing_unit
         this.tableOut[i].ctime = this.getTime(this.tableOut[i].ctime)
-        if(this.orgId == 9919 || this.orgId == 10402 || this.orgId == 0){
+        if(this.orgId == 9919 || this.orgId == 10402){
           this.tableOut[i].total_price = (this.tableOut[i].count * this.tableOut[i].buy_price).toFixed(2)
           this.tableOut[i].packing_price = this.tableOut[i].buy_price
         }else if(this.orgId == 10265){
@@ -830,6 +830,10 @@ export default {
           this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
         }else if(this.orgId == 10188){
           this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
+        }else if(this.orgId == 10489){
+          this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
+        }else if(this.orgId == 10375){
+          this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
         }else{
           this.tableOut[i].total_price = (this.getStockCount(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
         }
@@ -838,11 +842,11 @@ export default {
 
          this.tableOut[i].out_count = this.getMySelfCount(this.tableOut[i].good_id)
         }
-        if(this.orgId == 10210 || this.orgId == 9675  || this.orgId == 9956 || this.orgId == 10217 || this.orgId == 10188 || this.orgId == 10191){
+        if(this.orgId == 10210 || this.orgId == 9675  || this.orgId == 9956 || this.orgId == 10217 || this.orgId == 10188 || this.orgId == 10191 || this.orgId == 0 || this.orgId ==10489 || this.orgId == 10375){
           this.tableOut[i].out_count = this.getWarehouseOut(this.tableOut[i].good_id)
           console.log("out_count232233232332",this.tableOut[i].out_count)
         }
-        if(this.orgId!=10265 && this.orgId !=10215  && this.orgId != 9671 &&this.orgId!=10210&&this.orgId!=9675 && this.orgId!=9956&& this.orgId!=10217 && this.orgId!=10188 && this.orgId!=10191 && this.orgId!=9919 && this.orgId!=0&& this.orgId!=10402){
+        if(this.orgId!=10265 && this.orgId !=10215  && this.orgId != 9671 &&this.orgId!=10210&&this.orgId!=9675 && this.orgId!=9956&& this.orgId!=10217 && this.orgId!=10188 && this.orgId!=10191 && this.orgId!=9919 && this.orgId!=0&& this.orgId!=10402 && this.orgId != 10489 && this.orgId!=10375){
           this.tableOut[i].out_count = this.getStockCount(this.tableOut[i].good_id)
         }
        }

src/xt_pages/user/inspection.vue

@@ -1343,9 +1343,12 @@ export default {
                   item.value_direction = '↑'
                 }
               }
-              console.log("items23233232",item)
-              this.items.push(item)
-              console.log("items232232332wo",this.items)
+              // console.log("items23233232",item)
+              if(item.item_name!=""){
+                this.items.push(item)
+              }
+            
+              // console.log("items232232332wo",this.items)
 
               if(item.value.indexOf("http") >= 0){
                 this.isPic = true

src/xt_pages/workforce/template.vue

@@ -187,22 +187,11 @@
 
         <el-tab-pane name="first" :disabled="template_mode.mode == 0" >
 
-          <span slot="label"> {{first_template.week?'一周模版':'一周模版'}}
-
-             <span v-if="schedule.mode ==1">(本周)</span>
-             <span v-if="schedule.mode == 2 && schedule.execute_times%2==0">(下一周)</span>
-             <span v-if="schedule.mode == 2 && schedule.execute_times%2!=0">(本周)</span>
-
-             <span v-if="schedule.mode == 3 && schedule.execute_times%3 ==0">(下下周)</span>
-             <span v-if="schedule.mode == 3 && schedule.execute_times%3 ==1">(下周)</span>
-             <span v-if="schedule.mode == 3 && schedule.execute_times%3 ==2">(本周)</span>
-
-
-             <span v-if="schedule.mode == 4 && schedule.execute_times%4 ==0">(下下周)</span>
-             <span v-if="schedule.mode == 4 && schedule.execute_times%4 ==1">(下周)</span>
-             <span v-if="schedule.mode == 4 && schedule.execute_times%4 ==2">(本周)</span>
-             <span v-if="schedule.mode == 4 && schedule.execute_times%4 ==3">(上周)</span>
+          <span slot="label"> {{first_template.week?'一周模版'+'（'+first_template.week+'周'+'）':'一周模版'+'（'+first_template.week+'周'+'）'}}
 
+             <span v-if="schedule.mode ==1">{{'(本周)'}}</span>
+             <span v-if="schedule.mode == 2 && schedule.execute_times%2==0">{{'(下一周)'}}</span>
+             <span v-if="schedule.mode == 2 && schedule.execute_times%2!=0">{{'(本周)'}}</span>
 
           </span>
 
@@ -210,29 +199,19 @@
 
         <el-tab-pane  name="second" :disabled="template_mode.mode != 2 && template_mode.mode != 3 && template_mode.mode  != 4">
 
-          <span slot="label"> {{second_template.week?'二周模版':'二周模版'}}
-
-              <span v-if="schedule.mode == 2 && schedule.execute_times%2==0">(本周)</span>
-             <span v-if="schedule.mode == 2 && schedule.execute_times%2!=0">(下一周)</span>
-
-             <span v-if="schedule.mode == 3 && schedule.execute_times%3 ==0">(本周)</span>
-             <span v-if="schedule.mode == 3 && schedule.execute_times%3 ==1">(下周)</span>
-             <span v-if="schedule.mode == 3 && schedule.execute_times%3 ==2">(下下周)</span>
+          <span slot="label"> {{second_template.week?'二周模版'+'（'+second_template.week+'周'+'）':'二周模版'+'（'+second_template.week+'周'+'）'}}
 
-
-              <span v-if="schedule.mode == 4 && schedule.execute_times%4 ==0">(下下周)</span>
-             <span v-if="schedule.mode == 4 && schedule.execute_times%4 ==1">(下周)</span>
-             <span v-if="schedule.mode == 4 && schedule.execute_times%4 ==2">(本周)</span>
-             <span v-if="schedule.mode == 4 && schedule.execute_times%4 ==3">(上周)</span>
+             <span v-if="schedule.mode == 2 && schedule.execute_times%2==0">{{'(本周)'}}</span>
+             <span v-if="schedule.mode == 2 && schedule.execute_times%2!=0">{{'(下一周)'}}</span>
 
           </span>
         </el-tab-pane>
-
-        <el-tab-pane :label="  third_template.week? '三周模版':'三周模版'" name="third" :disabled="template_mode.mode != 3 && template_mode.mode  != 4">
+<!--                  {{ four_template.week?four_template.week+'周':""}}-->
+        <el-tab-pane :label="'三周模版'+'（'+third_template.week+'周'+'）'" name="third" :disabled="template_mode.mode != 3 && template_mode.mode  != 4">
 
         </el-tab-pane>
 
-      <el-tab-pane :label="four_template.week?'四周模版':'四周模版'" name="four" :disabled="template_mode.mode  != 4 ">
+      <el-tab-pane :label="'四周模版'+'（'+four_template.week+'周'+'）'" name="four" :disabled="template_mode.mode  != 4 ">
         </el-tab-pane>
       </el-tabs>
               </div>