修改方济医院bug

src/pages/main/PrintIndex.vue

@@ -10,8 +10,8 @@
           <!--&lt;!&ndash;<el-button size="mini" type="primary" icon="el-icon-printer" @click="printThisPage">打印</el-button>&ndash;&gt;-->
         <!--</div>-->
       </div>
-      <DialysisPrintOrderOne style="margin-top:60px;" v-bind:childResponse="childResponse" v-if="org_template_info.template_id != 2"> </DialysisPrintOrderOne>
-      <DialysisPrintOrderTwo style="margin-top:60px;" v-bind:childResponse="childResponse" v-if="org_template_info.template_id == 2"></DialysisPrintOrderTwo>
+      <DialysisPrintOrderOne style="margin-top:60px;" v-bind:childResponse="childResponse" v-if="org_template_info.template_id ==1"> </DialysisPrintOrderOne>
+      <DialysisPrintOrderTwo style="margin-top:60px;" v-bind:childResponse="childResponse" v-if="org_template_info.template_id ==2||org_template_info.template_id ==0"></DialysisPrintOrderTwo>
 
     </div>
   </div>

src/pages/main/WaitingArea.vue

@@ -342,13 +342,14 @@
 
         var zones = []
         zones.push({value: 0, text: '全部分区'})
+
         for (var zoneId in zoneMap) {
           zones.push({value: zoneMap[zoneId].id, text: zoneMap[zoneId].name})
         }
 
-        zones = zones.sort(function (a, b) {
-          return a.id > b.id
-        })
+        // zones = zones.sort(function (a, b) {
+        //   return a.value > b.value
+        // })
         return zones
       },
       processScheduals: function (scheduals) {

src/pages/main/dialog/OrdersDialog.vue

@@ -7,7 +7,9 @@
         <span class="success">&nbsp;</span>
       </div>
       <div class="yzNav" style="width:100%;">
-        <span @click="openNewAdvice">新增医嘱</span>
+        <span  @click="openNewAdvice"
+               :class="{ forbid: this.$store.getters.user.user.user_type == 3 }"
+        >新增医嘱</span>
         <span
           v-if="isShowExce"
           @click="execAdvice"
@@ -24,7 +26,7 @@
         >医嘱核对</span>
         <span
           @click="openNewChild"
-          :class="{ forbid: current_advice == null || current_advice.parent_id > 0 ||  currentAdvices.length != 1}"
+          :class="{ forbid: current_advice == null || current_advice.parent_id > 0 ||  currentAdvices.length != 1 || this.$store.getters.user.user.user_type == 3 }"
         >添加子药</span>
         <span v-if="currentSubAdvices.length <= 0" @click="modifyAdviceAction"
               :class="{ forbid: current_group_index < 0 ||  currentAdvices.length != 1 }">修改医嘱</span>
@@ -1062,6 +1064,11 @@
         this.$refs.exec_time.open()
       },
       openNewChild () {
+        if (this.$store.getters.user.user.user_type == 3) {
+          Toast.fail('你没有权限添加子药！')
+          return
+        }
+
         if (this.currentAdvices.length == 0) {0
           return false
         }
@@ -1092,6 +1099,10 @@
         return
       },
       openNewAdvice () {
+        if (this.$store.getters.user.user.user_type == 3) {
+          Toast.fail('你没有权限新增医嘱！')
+          return
+        }
 
         this.currentAdvices = []
         this.currentSubAdvices = []

src/pages/main/dialog/PrescriptionDialog.vue

@@ -172,7 +172,7 @@
             <input  @focus="inputFocus" id="dt" v-model="dialysisPrescription.dialyzer_perfusion_apparatus"/>
           </div>
         </div>
-        <div class="line" v-if="this.$store.getters.user.template_info.template_id == 2"></div>
+        <div class="line"></div>
 
         <div @click="showSubMenu('body_fluid')" class="item" ref="body_fluid" v-if="isShow('体液过多症状')">
           <label class="name" for="knj">体液过多症状</label>

src/pages/main/template/DialysisPrintOrderOne.vue

@@ -1156,14 +1156,14 @@
 
         const style = '@media print {.dialysis-print-order{width:960px;margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}'
 
-        if (this.org_template_info.template_id != 2) {
+        if (this.org_template_info.template_id == 1) {
           printJS({
             printable: 'dialysis-print-box',
             type: 'html',
             style: style,
             scanStyles: false
           })
-        } else if (this.org_template_info.template_id == 2) {
+        } else if (this.org_template_info.template_id == 2||this.org_template_info.template_id == 0) {
           printJS({
             printable: 'dialysis-print-box-1',
             type: 'html',
@@ -1434,7 +1434,7 @@
         }
         return ''
       }, getAge: function(val) {
-        if (this.org_template_info.template_id == 2) {
+        if (this.org_template_info.template_id == 2 || this.org_template_info.template_id == 0) {
           if (val.age == 0) {
             return jsGetAge(val.birth, '-')
           } else {

src/pages/main/template/DialysisPrintOrderTwo.vue

@@ -1157,14 +1157,14 @@
 
         const style = '@media print {.dialysis-print-order{width:960px;margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px}.dialysis-print-order .print-table-no{width:100%;text-align:left;border-collapse:collapse;font-size:14px} .dialysis-print-order .under_line {display: inline-block;border-bottom: 1px solid #999;text-align:left;white-space: nowrap;width: 50%;} .dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 30px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}'
 
-        if (this.org_template_info.template_id != 2) {
+        if (this.org_template_info.template_id == 1) {
           printJS({
             printable: 'dialysis-print-box',
             type: 'html',
             style: style,
             scanStyles: false
           })
-        } else if (this.org_template_info.template_id == 2) {
+        } else if (this.org_template_info.template_id == 2||this.org_template_info.template_id == 0) {
           printJS({
             printable: 'dialysis-print-box-1',
             type: 'html',
@@ -1550,7 +1550,7 @@
         }
         return ''
       }, getAge: function(val) {
-        if (this.org_template_info.template_id == 2) {
+        if (this.org_template_info.template_id == 2 || this.org_template_info.template_id == 0) {
           if (val.age == 0) {
             return jsGetAge(val.birth, '-')
           } else {