新分支

src/api/role/admin.js

@@ -133,4 +133,13 @@ export function toTestFive(params){
      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_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/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/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,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/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>